From: Romain Francoise <romain@orebokech.com>
Date: Thu, 1 Mar 2007 13:58:24 +0000 (+0000)
Subject: Remove conflict marker.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~1822
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9c66da2df18019124e55f3430d566f3e3643b710;p=emacs.git

Remove conflict marker.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83a9434b254..51b42ebf997 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -45,7 +45,6 @@
 
 	* desktop.el: Delete header line listing me as maintainer.
 
->>>>>>> 1.10749
 2007-02-28  Glenn Morris  <rgm@gnu.org>
 
 	* tutorial.el (tutorial--describe-nonstandard-key): Tweak text in